From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 25 Dec 2020 02:58:19 +0000 (+0000)
Subject: Merge version 4:5.19.5-4+rpi1 and 4:5.20.4-2 to produce 4:5.20.4-2+rpi1
X-Git-Tag: archive/raspbian/4%5.20.4-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=06056d58aa7651b46b2377b1ab52475d2f9f94fc;p=libksysguard.git

Merge version 4:5.19.5-4+rpi1 and 4:5.20.4-2 to produce 4:5.20.4-2+rpi1
---

06056d58aa7651b46b2377b1ab52475d2f9f94fc
diff --cc debian/changelog
index f888373,9c9533b..02a8077
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- libksysguard (4:5.19.5-4+rpi1) bullseye-staging; urgency=medium
++libksysguard (4:5.20.4-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:5.17.5-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 17 Feb 2020 22:43:59 +0000]
 +  * Remove armhf from qtwebengine architecture list.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Nov 2020 22:09:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 25 Dec 2020 02:58:19 +0000
++
+ libksysguard (4:5.20.4-2) unstable; urgency=medium
+ 
+   * Release to unstable.
+ 
+  -- Norbert Preining <norbert@preining.info>  Tue, 22 Dec 2020 11:04:37 +0900
+ 
+ libksysguard (4:5.20.4-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (5.20.4).
+   * Update build-deps with the info from cmake.
+   * Update list of installed files.
+   * Update symbols.
+ 
+  -- Norbert Preining <norbert@preining.info>  Wed, 09 Dec 2020 14:17:32 +0900
  
  libksysguard (4:5.19.5-4) unstable; urgency=medium
  
diff --cc debian/control
index da3a213,9c89884..753dbbe
--- a/debian/control
+++ b/debian/control
@@@ -30,9 -30,10 +30,10 @@@ Build-Depends: cmake (>= 3.0~)
                 libx11-dev,
                 libxres-dev,
                 pkg-kde-tools (>= 0.15.18~),
-                qtbase5-dev (>= 5.14.0~),
-                qtscript5-dev (>= 5.14.0~),
-                qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mipsel],
+                qtbase5-dev (>= 5.15.0~),
+                qtscript5-dev (>= 5.15.0~),
+                qttools5-dev (>= 5.15.0~),
 -               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 armhf i386 mipsel],
++               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 i386 mipsel],
                 xauth,
                 xvfb,
                 zlib1g-dev,